Merge from emacs-24; up to r111206
authorGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 08:07:37 +0000 (00:07 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 08:07:37 +0000 (00:07 -0800)
commita7288798f0c6a44951979e17fcd302464d990d9e
treee2118a41a5d5c9e2e2055f1c1ac5277dd81e60b7
parent9840220527cc1d5ab5f1f8f024d1a234e40c65b0
parentfaeeacef00c6565ef652dbaca7c0db0a0fdf810b
Merge from emacs-24; up to r111206
lisp/ChangeLog
lisp/emacs-lisp/cl.el
lisp/imenu.el
lisp/progmodes/python.el
src/ChangeLog
src/w32.c